Body of the historical leader of the Angolan rebellion Unita, Jonas Savimbi, to be exhumed "before the end of the year" and reburied with dignity.